summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2018-07-28 01:37:32 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-07-28 01:37:32 +0200
commit40e5596aa7020fe65b3e14336c61d5e096a1f6b2 (patch)
tree04861af0abe2a1a8644732820824a79d40149336
parentMerge "Move recovery from /sbin to /system/bin" am: 4c80768796 am: ed2480be9b am: dcc5fa4d4f (diff)
parentMerge "minadbd: avoid overrriding services_to_fd." am: 6f1f2c811a am: 06ce8d32e6 (diff)
downloadandroid_bootable_recovery-40e5596aa7020fe65b3e14336c61d5e096a1f6b2.tar
android_bootable_recovery-40e5596aa7020fe65b3e14336c61d5e096a1f6b2.tar.gz
android_bootable_recovery-40e5596aa7020fe65b3e14336c61d5e096a1f6b2.tar.bz2
android_bootable_recovery-40e5596aa7020fe65b3e14336c61d5e096a1f6b2.tar.lz
android_bootable_recovery-40e5596aa7020fe65b3e14336c61d5e096a1f6b2.tar.xz
android_bootable_recovery-40e5596aa7020fe65b3e14336c61d5e096a1f6b2.tar.zst
android_bootable_recovery-40e5596aa7020fe65b3e14336c61d5e096a1f6b2.zip
-rw-r--r--minadbd/minadbd_services.cpp30
1 files changed, 8 insertions, 22 deletions
diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp
index 043c51a6a..ab1939e92 100644
--- a/minadbd/minadbd_services.cpp
+++ b/minadbd/minadbd_services.cpp
@@ -21,15 +21,18 @@
#include <string.h>
#include <unistd.h>
+#include <functional>
#include <string>
#include <thread>
#include "adb.h"
+#include "adb_unique_fd.h"
#include "fdevent.h"
#include "fuse_adb_provider.h"
+#include "services.h"
#include "sysdeps.h"
-static void sideload_host_service(int sfd, const std::string& args) {
+static void sideload_host_service(unique_fd sfd, const std::string& args) {
int file_size;
int block_size;
if (sscanf(args.c_str(), "%d:%d", &file_size, &block_size) != 2) {
@@ -45,22 +48,7 @@ static void sideload_host_service(int sfd, const std::string& args) {
exit(result == 0 ? 0 : 1);
}
-static int create_service_thread(void (*func)(int, const std::string&), const std::string& args) {
- int s[2];
- if (adb_socketpair(s)) {
- printf("cannot create service socket pair\n");
- return -1;
- }
-
- std::thread([s, func, args]() { func(s[1], args); }).detach();
-
- VLOG(SERVICES) << "service thread started, " << s[0] << ":" << s[1];
- return s[0];
-}
-
-int service_to_fd(const char* name, atransport* /* transport */) {
- int ret = -1;
-
+unique_fd daemon_service_to_fd(const char* name, atransport* /* transport */) {
if (!strncmp(name, "sideload:", 9)) {
// this exit status causes recovery to print a special error
// message saying to use a newer adb (that supports
@@ -68,10 +56,8 @@ int service_to_fd(const char* name, atransport* /* transport */) {
exit(3);
} else if (!strncmp(name, "sideload-host:", 14)) {
std::string arg(name + 14);
- ret = create_service_thread(sideload_host_service, arg);
- }
- if (ret >= 0) {
- close_on_exec(ret);
+ return create_service_thread("sideload-host",
+ std::bind(sideload_host_service, std::placeholders::_1, arg));
}
- return ret;
+ return unique_fd{};
}